Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 25 May 2010 07:23:37 +0000 (07:23 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 25 May 2010 07:23:37 +0000 (07:23 +0000)

Trivial merge